bitkeeper revision 1.1337 (426630b2jBKjnL7WBIWHGPtgL50rqg)

[PATCH] [PATCH] gdbserver minor build fixes

 gdb-6.2.1-xen-sparse/gdb/gdbserver/configure    |    2 +-
 gdb-6.2.1-xen-sparse/gdb/gdbserver/configure.in |    2 +-
 gdbbuild                                        |   16 ++++++++++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

More cleanups are possible, I'll send those at a later stage.

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 891ae8d98e283e060f345ef91380a4c09ea0bbfc..943f7d9fbd08a6912ee1bbdeb48914a30a79a890 100644 (file)
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -20,6 +20,7 @@ cl349@arcadians.cl.cam.ac.uk
 cl349@firebug.cl.cam.ac.uk
 cl349@freefall.cl.cam.ac.uk
 cl349@labyrinth.cl.cam.ac.uk
+cw@f00f.org
 cwc22@centipede.cl.cam.ac.uk
 cwc22@donkeykong.cl.cam.ac.uk
 djm@djmnc4000.(none)

diff --git a/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure b/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure
index 85011cead07aac19b77c4f67ee23e5cbc8bb111f..e81046517a6d982784d9a38989104586c632e84d 100755 (executable)
--- a/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure
+++ b/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure
@@ -3475,7 +3475,7 @@ USE_THREAD_DB=
 
 
 GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_thread_depfiles"
-GDBSERVER_LIBS="$srv_libs -lxc"
+GDBSERVER_LIBS="$srv_libs -L../../../../libxc/ -L../../../../libxutil/ -lxc -lxutil"
 
 
 

diff --git a/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure.in b/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure.in
index 94b281582fe8233f23f89bdc94d84d2f1d926864..032eabe345c8122e0c00fa4e70f367bf6b7562ac 100644 (file)
--- a/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure.in
+++ b/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure.in
@@ -107,7 +107,7 @@ USE_THREAD_DB=
 
 
 GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_thread_depfiles"
-GDBSERVER_LIBS="$srv_libs -lxc"
+GDBSERVER_LIBS="$srv_libs -L../../../../libxc/ -L../../../../libxutil/ -lxc -lxutil"
 
 AC_SUBST(GDBSERVER_DEPFILES)
 AC_SUBST(GDBSERVER_LIBS)

diff --git a/tools/gdb/gdbbuild b/tools/gdb/gdbbuild
index 29efd6bf9e4df9e8a23ce74845e44b5e5ef89440..2a5287084964c53c411162e4fa37411a99c60647 100755 (executable)
--- a/tools/gdb/gdbbuild
+++ b/tools/gdb/gdbbuild
@@ -1,9 +1,12 @@
-#!/bin/csh -f
-setenv XENROOT `bk root`
+#!/bin/sh
+
+XENROOT=`bk root`
+export XENROOT
 
 cd $XENROOT/tools/gdb
 rm -rf gdb-6.2.1  gdb-6.2.1-linux-i386-xen
-wget ftp://ftp.gnu.org/gnu/gdb/gdb-6.2.1.tar.bz2
+# FIXME:cw this should be smarter
+wget -c ftp://ftp.gnu.org/gnu/gdb/gdb-6.2.1.tar.bz2
 tar xjf gdb-6.2.1.tar.bz2
 
 cd $XENROOT/tools/gdb/gdb-6.2.1-xen-sparse
@@ -12,4 +15,9 @@ cd $XENROOT/tools/gdb/gdb-6.2.1-xen-sparse
 mkdir $XENROOT/tools/gdb/gdb-6.2.1-linux-i386-xen
 cd $XENROOT/tools/gdb/gdb-6.2.1-linux-i386-xen
 ../gdb-6.2.1/configure
-gmake -j4
+# some people don't have gmake
+if which gmake ; then
+    gmake -j4
+else
+    make -j4
+fi